aboutsummaryrefslogtreecommitdiffstats
path: root/src/routes/(app)/[username]
diff options
context:
space:
mode:
Diffstat (limited to 'src/routes/(app)/[username]')
-rw-r--r--src/routes/(app)/[username]/(profile)/+page.server.js3
-rw-r--r--src/routes/(app)/[username]/(profile)/messages/+page.svelte6
-rw-r--r--src/routes/(app)/[username]/address/+page.server.js4
-rw-r--r--src/routes/(app)/[username]/dashboard/+page.svelte130
-rw-r--r--src/routes/(app)/[username]/receive/[...param]/+page.svelte4
-rw-r--r--src/routes/(app)/[username]/request/[id]/+page.server.js6
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/+page.svelte2
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/_account.svelte4
8 files changed, 79 insertions, 80 deletions
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index 9c91efae..c29ed7df 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -3,12 +3,11 @@ import { get } from '$lib/utils';
export async function load({ params, parent, url }) {
let { subject } = await parent();
let { pubkey } = subject;
- if (!pubkey) pubkey = params.username;
let events = [];
try {
- events = await get(`/nostr/${pubkey}`);
+ events = await get(`/${pubkey}/notes`);
} catch (e) {
console.log(`failed to fetch nostr events for ${pubkey}`, e);
}
diff --git a/src/routes/(app)/[username]/(profile)/messages/+page.svelte b/src/routes/(app)/[username]/(profile)/messages/+page.svelte
index dbf02cf2..fd12c6bf 100644
--- a/src/routes/(app)/[username]/(profile)/messages/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/messages/+page.svelte
@@ -27,10 +27,10 @@
if (!$messages[user.pubkey][subject.pubkey][m.id]) {
m.message = await decrypt({ event: m, user });
$messages[user.pubkey][subject.pubkey][m.id] = m;
- tick().then(() => (pane.scrollTop = pane.scrollHeight));
+ tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
}
}
- tick().then(() => (pane.scrollTop = pane.scrollHeight));
+ tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
};
$: events =
@@ -56,7 +56,7 @@
event.id = await calculateId(event);
$messages[user.pubkey][subject.pubkey][event.id] = event;
$messages = $messages;
- tick().then(() => (pane.scrollTop = pane.scrollHeight));
+ tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
try {
event.content = await encrypt({ message, recipient: subject.pubkey, user });
diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js
index c18bcdba..281f9e2d 100644
--- a/src/routes/(app)/[username]/address/+page.server.js
+++ b/src/routes/(app)/[username]/address/+page.server.js
@@ -8,6 +8,6 @@ export async function load({ cookies, params, parent }) {
network: 'bitcoin',
rate: rates[user.currency]
};
- let { uuid } = await post('/invoice', { invoice, user }, auth(cookies));
- throw redirect(307, `/invoice/${uuid}`);
+ let { id } = await post('/invoice', { invoice, user }, auth(cookies));
+ throw redirect(307, `/invoice/${id}`);
}
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 3fcf8c06..86ec5c0e 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -20,7 +20,7 @@
let animateRate = (newRate) => {
if (!accountBalanceFiat) return;
let t = 0;
- let newBalance = (user.account.balance * newRate) / sats;
+ let newBalance = (user.balance * newRate) / sats;
let oldBalance = parseFloat(accountBalanceFiat);
let diff = oldBalance - newBalance;
let rateDiff = oldRate - newRate;
@@ -47,7 +47,7 @@
$: user = data.user;
$: accountBalanceFiat =
accountBalanceFiat ||
- (user && $selectedRate && ((user.account.balance * $selectedRate) / sats).toFixed(2));
+ (user && $selectedRate && ((user.balance * $selectedRate) / sats).toFixed(2));
let payreq = '',
payreqField,
@@ -55,7 +55,7 @@
$: btcPrice = f($selectedRate, user.currency);
- $: accountBalanceBtc = user.account.balance / sats;
+ $: accountBalanceBtc = user.balance / sats;
</script>
<div class="container px-4 max-w-md mx-auto mt-20 space-y-12 mb-8">
@@ -65,7 +65,7 @@
</div>
<div class="text-secondary text-2xl">
- ⚡️{s(user.account.balance)}
+ ⚡️{s(user.balance)}
</div>
</div>
@@ -92,68 +92,68 @@
</a>
</div>
- <div>
- {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }}
- {@const requested = user.username === requester.username}
- <a href={`/invoice/${uuid}` + (requested ? '/tip' : '')}>
- <div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
- <div class="flex gap-2">
- <div>
- {#if requested}
- <div class="flex">
- <Avatar user={recipient} size={20} />
- <div class="my-auto text-left">
- <p class="text-secondary">{$t('transactions.invoiceFrom')}</p>
- <p class="ml-1 text-lg break-words">{recipient.username}</p>
- </div>
- </div>
- {:else}
- <div class="flex">
- <Avatar user={requester} size={20} />
- <div class="my-auto text-left">
- <p class="text-secondary">{$t('transactions.awaiting')}</p>
- <p class="ml-1 text-lg break-words">{requester.username}</p>
- </div>
- </div>
- {/if}
- </div>
- <div class="whitespace-nowrap my-auto ml-auto flex gap-2">
- <div class="font-bold">
- {f(amount * (rate / sats), currency)}
- </div>
+ <!-- <div> -->
+ <!-- {#each invoices as { request_id, amount, currency, rate, user: recipient, requester, id }} -->
+ <!-- {@const requested = user.username === requester?.username} -->
+ <!-- <a href={`/invoice/${id}` + (requested ? '/tip' : '')}> -->
+ <!-- <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> -->
+ <!-- <div class="flex gap-2"> -->
+ <!-- <div> -->
+ <!-- {#if requested} -->
+ <!-- <div class="flex"> -->
+ <!-- <Avatar user={recipient} size={20} /> -->
+ <!-- <div class="my-auto text-left"> -->
+ <!-- <p class="text-secondary">{$t('transactions.invoiceFrom')}</p> -->
+ <!-- <p class="ml-1 text-lg break-words">{recipient.username}</p> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- {:else} -->
+ <!-- <div class="flex"> -->
+ <!-- <Avatar user={requester} size={20} /> -->
+ <!-- <div class="my-auto text-left"> -->
+ <!-- <p class="text-secondary">{$t('transactions.awaiting')}</p> -->
+ <!-- <p class="ml-1 text-lg break-words">{requester.username}</p> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- {/if} -->
+ <!-- </div> -->
+ <!-- <div class="whitespace-nowrap my-auto ml-auto flex gap-2"> -->
+ <!-- <div class="font-bold"> -->
+ <!-- {f(amount * (rate / sats), currency)} -->
+ <!-- </div> -->
+ <!-- -->
+ <!-- <div class="text-secondary">{sat(amount)}</div> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- </a> -->
+ <!-- {/each} -->
+ <!-- </div> -->
- <div class="text-secondary">{sat(amount)}</div>
- </div>
- </div>
- </div>
- </a>
- {/each}
- </div>
-
- <div>
- {#each requests as { id, invoice, memo, requester: r }}
- <a href={`/${user.username}/receive/${id}`}>
- <div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
- <div class="flex">
- <div>
- <div class="flex">
- <Avatar user={r} size={20} />
- <div class="my-auto text-left">
- <p class="ml-1 text-lg break-words">{r.username}</p>
- <p class="ml-1 text-secondary">{memo}</p>
- </div>
- </div>
- </div>
- <div class="whitespace-nowrap my-auto ml-auto flex gap-2">
- <button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
- >Invoice</button
- >
- </div>
- </div>
- </div>
- </a>
- {/each}
- </div>
+ <!-- <div> -->
+ <!-- {#each requests as { id, invoice, memo, requester: r }} -->
+ <!-- <a href={`/${user.username}/receive/${id}`}> -->
+ <!-- <div class="border-b p-2 last:border-b-0 hover:bg-gray-100"> -->
+ <!-- <div class="flex"> -->
+ <!-- <div> -->
+ <!-- <div class="flex"> -->
+ <!-- <Avatar user={r} size={20} /> -->
+ <!-- <div class="my-auto text-left"> -->
+ <!-- <p class="ml-1 text-lg break-words">{r.username}</p> -->
+ <!-- <p class="ml-1 text-secondary">{memo}</p> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- <div class="whitespace-nowrap my-auto ml-auto flex gap-2"> -->
+ <!-- <button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full" -->
+ <!-- >Invoice</button -->
+ <!-- > -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- </div> -->
+ <!-- </a> -->
+ <!-- {/each} -->
+ <!-- </div> -->
</div>
<div class="flex fixed w-full px-4 bg-white py-2 bottom-0 bg-opacity-90">
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index 548f324f..4559f00c 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -21,7 +21,7 @@
let { user } = data;
$: paid = browser && form && Object.values($invoices).find((inv) => inv.amount === form.amount);
- $: paid && goto(`/invoice/${paid.uuid}/paid`);
+ $: paid && goto(`/invoice/${paid.id}/paid`);
</script>
<form method="POST" class="flex justify-center items-center mt-24 mb-3 px-3" use:enhance>
@@ -34,7 +34,7 @@
<input type="hidden" name="request_id" value={request.id} />
{/if}
- <input type="hidden" name="prompt" value={user?.username === username} />
+ <input type="hidden" name="prompt" value={false} />
<div class="space-y-3 w-[300px] mx-auto">
<Numpad bind:amount bind:currency />
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 7beabfe6..001bd6e0 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -9,14 +9,14 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => {
let { invoice } = request;
if (invoice) {
- let { amount, received, uuid } = invoice;
+ let { amount, received, id } = invoice;
if (
request.recipient.username === user.username &&
((received && !amount) || received >= amount)
)
- throw redirect(307, `/invoice/${uuid}/paid`);
+ throw redirect(307, `/invoice/${id}/paid`);
- if (request.requester.username === user.username) throw redirect(307, `/send/${uuid}`);
+ if (request.requester.username === user.username) throw redirect(307, `/send/${id}`);
}
return { request };
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 92946544..94ca2223 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -78,7 +78,7 @@
content: JSON.stringify({
name: user.username,
about: user.address,
- picture: `${PUBLIC_COINOS_URL}/public/${user.uuid}-profile.webp`
+ picture: `${PUBLIC_COINOS_URL}/public/${user.id}-profile.webp`
}),
tags: []
};
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index ba046735..93b5442d 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -97,7 +97,7 @@
on:keydown={() => select('profile')}
>
<img
- src={`/api/public/${user.uuid}-profile.webp`}
+ src={`/api/public/${user.id}-profile.webp`}
class="absolute w-full h-full object-cover object-center visible overflow-hidden"
alt={user.username}
/>
@@ -151,7 +151,7 @@
/>
{:else if user.banner}
<img
- src={`/api/public/${user.uuid}-banner.webp`}
+ src={`/api/public/${user.id}-banner.webp`}
class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
on:click={() => select('banner')}
on:keydown={() => select('banner')}